# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1496.1.4 -> 1.1496.1.5
#	include/asm-ia64/spinlock.h	1.18    -> 1.19   
#	arch/ia64/kernel/head.S	1.15    -> 1.16   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/12/10	davidm@tiger.hpl.hp.com	1.1496.1.5
# ia64: Jim Wilson says that gcc v3.3 also supports marking ar.pfs as
# 	clobbered, so use ia64_spinlock_contention() for any GCC with
# 	v3.3 or newer.
# --------------------------------------------
#
diff -Nru a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S
--- a/arch/ia64/kernel/head.S	Sun Dec 14 00:40:09 2003
+++ b/arch/ia64/kernel/head.S	Sun Dec 14 00:40:09 2003
@@ -864,7 +864,7 @@
 	 * the clobber lists for spin_lock() in include/asm-ia64/spinlock.h.
 	 */
 
-#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
+#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
 
 GLOBAL_ENTRY(ia64_spinlock_contention_pre3_4)
 	.prologue
diff -Nru a/include/asm-ia64/spinlock.h b/include/asm-ia64/spinlock.h
--- a/include/asm-ia64/spinlock.h	Sun Dec 14 00:40:09 2003
+++ b/include/asm-ia64/spinlock.h	Sun Dec 14 00:40:09 2003
@@ -39,7 +39,7 @@
 {
 	register volatile unsigned int *ptr asm ("r31") = &lock->lock;
 
-#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
+#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
 # ifdef CONFIG_ITANIUM
 	/* don't use brl on Itanium... */
 	asm volatile ("{\n\t"